Finally finished stuffing around with Collection and Options classes.