Starting work on making Habits more testable

Then go on to actual serialization/persistence work
In process of extracting Habits model
Even cleaner now, all habit colletion concerns moved into Habits