first working after re-org
added constructor to base Model class