initial commit w/ custom entities