added registration tracker, some refactoring, starting to add map support