Preparing to rejigger internal data structure
Split up into main/helper app