Need to do some quick testing before committing again. No point committing something that clearly doesn't work yet.