Updated comment notes
Massive refactoring... Its all broken!