This looks really good! I really like how this changes new from a confusing trap into a nice decorator.