Further changes and progress
Refactoring code
Refactoring