untested basic update to 1.5

Still have to bug test and add textures but it looks to be mostly done.