Refactored, stripped-back and added Gulp