initial
Beatified code
Merge with github repo