added more defs...getting there