1b done
work in progress, but this is it