Started work on a more steamlined parser