Started adding semantic checking