Change description to something more better
Move TODO stuff into GH issues