(WIP) Add property types, fix routes, some cleanup