New parser code, currently broken but want to save progress