Have to sort the re-wireing soon, and have to sort out that fucking leak still