progress, leaving some cruft in the code for now