Add basic execution and refactor parse method