stripped geoff out into separate project