Feature 3225: Working on Repository and API stuff (sorry about the mass changes)