another bunch of work. still very much in progress