small factory updates
give up on engines, move shaving back to app