First Commit, working but not finished