Continue organizing and seperating functionality to specific objects