Appear to have implemented add

Along with more work on function calls