Now handles HL1005 demo messages of type '2' (unknown as of yet). Lots of refactoring done too