big commit of work in progress stuff