hoek 2.0. Closes #228