got rearranging of sites working clientside, now just need to make it work server side