Initial Commit (Attempt 3)