Tidy it aint currently, working on tidying up the wiring tonight. Not that I have confidence it wont create a fireworks display yet.