working out bugs.....