Branch development

Very nearly finished with the branch now! Here it is so far!

All that needs to be done now is for it to be UV Mapped by Marios, textured by myself and it'll be good to go!