working on find_by_all features
cleaned up merge conflicts with Paul present