Commit before doing a major overhaul of this project. All working!