Starting work on proper filename/pattern matching.