alright reverted all the object level stuff from earlier because it broke everything :(