More work done on the dev branch.