Work in progress on Hawk code
More Hawk tests