Initial Commit Project 3 (Overall Project Rebuild)