implemented new-style filters and formatting
new hash storage model ready for testing