Moving legacy code to it's own branch