Fiddling with code, moving things together