Remove TODOS
Merge branch 'develop' of github.com:TigerWolf/shaprgram into develop