About to make some significant changes on a new branch...