Added support for using properties as fields instead of fields directly
git is going wonky
Single update support and some refacotring.
Hoping to fix things.