Started work on rewriting properties