commit 45

moving code around