work on async; new refactor folder
moving some cruft out of the way
minor fixes