catching up and moved some things