Moving everything everywhere ever. Trying to convert this to a more object oriented approach