Refactoring

The new version of barrage makes lots of things way easiser