I think it may be better to create a separate Parser class, and start using that instead. Will make for a slightly nicer design