First attempt at creating a proper repositiory