Committing all before re-locating this code.