continued adding stuff a working/reworking some stuff, then got sidetracked with 'other things'
some more