Added basic API and lexical parsing