Back to where I finished last time, but with maybe nicer code.
test commit