Working on properties

Its getting better, but still quite messy