Major refactorings.
Adding category view controller. Adding more stuff
More stuff ...