Update to general workings, general overhaul really