[WIP] Create new location model