More tinkering... will finish when conscious.