Third Commit. GUI done, project spec met