Development continues...removing any "Homework" part from the project...