Moving legacy code into it's own branch