move more code around
getting ugly, but just want to play around a bit