Organise the data
Fix return job, add list making collision code