more work, but in progress
bugfixes
lots of progress