Cleaned up Project1