[WIP] Cleaned Up The Models And Repositories