stash some development ideas in master (whole thing is broken until next release anyway)