Working out the bugs..