WIP (does not compile): pre-going out for a coffee with macbook commit