Working as a class

Next up is to make the match string external.