Implement FreeformStatementDelegate 

Add some functionality tests