renamed some things/moved pieces