Fix if-then to wrap the body in braces not parens
Add top type and implement in methods to fix #27
Start adding class to the grammar