even 'spike' code needs testing
MERGECONFLICT: fixed mergeconflict with remote github repo