Overhaul on loading the repo + many code updates