Updating to 1.5

Still unfinished... May not work entirely yet