cleaning + add parser and engine draft