don't use seperate .h's; add constIterator