inital work on moving some items around