Issue #2: WIP - cleanup / readme update