I will remove this and do a bit of refactoring before merging.