Cleaned up go method, placed methods in correct classes