Added functionality. About to make additional changes.