Split out of Scotty repo