simplified model, added baseURL and constructor to collections, cleared errors
merged amy
merged master