save work related to poor mans cacheing and code, cleanup and merge conflicts resolved