Move more stuff around and add further stuff