Remove testing code and starting Bonus #1