Milestone 1 commit, fully working implementation...