Implement repository in main container (still buggy)