Working version prior to starting Firebase
Added basic filtering