first few changes to make it specific to Conor
now compiled