Cee's testing branch

Add properties