Giving Shawn a clean starting point. Reverting the non compiling entity changes.