Removing bugs -- need to start write tests...