Major Rewrite 1.0
so changes to properties