Revamping stuff; everything is broken