moving code around