fixes #2, data model/remove logic from templates