Finished several TODOs
Merge github readme