Added lots of Calebs changes.