Implemented basic return / block handling