merge @davidszotten's property deprecation stuff