last commit, finished everything