Got MVP working
Moved todo's to github issues