-Reworked scaling and added a bunch of changes to try to accomodate that