Added some notes
Refactor continued; started filter view