Slight re-working
Filters and bloomberg parser etc.