Homework finished
Fix a bug
Fix a bug
For Part two