Added more functionality

Still needs osme testing and a lot of tidying up, but nedd to move onto
analyzing dumps. Might revisit when get time.