Starting a more structured attempt. Not been smoke tested yet