WIP
Adding HOAS evaluation