Moving more code around