some refactor, added todo, aubSearch implemented (need some design now)