major refactor, dev on hold, rebuilding