added stuff
Merge http://github.com/venomouse/os5
Merge http://github.com/venomouse/os5
Finished writing, full of debug ahead of us