Updated thesis, changed chapter ordering