improved repository methods,
starts working on view and controllers