final commit, have everything working