Changed expression to regex
Ignoring .swp files now
Moved regex to its own class
Started writing tests