Feature/snippets

Not related to this PR but logic like this should not be here.