Got the pricecollector working and have removed the Timeframe class in favour of a set of valid timeframe strings