Added some basic item classes

Also fixed up the to do list
Readd the removed classes not sure what on earth

the Github app was doing..