Starting major refactoring of the mess that is garden.