Commit more often. Lot's of changes. Latest is addition of almost finished AbstractEntityPatcher.