do this the "right" way (this is gonna need work)
do this the "right" way (this is gonna need work)
testing this assumption
Merge branch 'master' into observable-attributes-and-methods