Change everything, add an S-expression parser