Had a bit of a tidyup, lifted everything up higher so I can reach more easily, and pluged everything into the new powerpoints, Will tidy up the cables later and swap out the ep1500 with the ep2000.