Add a kit parser and some cleanup