First filter

Closes #6
Resolved conflicts