Begin refactoring to use s-expressions