Commit 2 by Ethan: made the model methods