Added debug printing, changing name scheme, ready for testing