Getting ip collection working
Large refactoring and separation for projects
Getting things back into a working state