Continue porting
Update error reporting handling
Add support for new
Continue porting to x3
Add support for function calls