Bug List and design changes complete. Now just need to do some Robotium testing