fixed bug - all properties are now Option() and have to take that into account