Repo fixed + All Base Classes Done.. maybe.