Moving everything around to make things simpler
cleaning up