Removed bracket dependancy and updated input parsing to use a custom class rather than a per function parse.