Moved some stuff around and added base for peoxy system