Improving last commit, still lots to do