Started refactoring the so we can start storing ways and relations