Cleaned up old solution and added the final project