TRY: Start to clean up and move things around