Move everything to it's object