Changes made during mock rolls, debugging sessions that need to be pr…

Changes made during mock rolls, debugging sessions that need to be pr… #194