Listing todo's.
rearanging server functions
introducing underscore
minor changes
minor changes
integrating code review on master