Trying to clean up / coalesce towards a working test case :)