Thesis - chapter 1 and 6 added, almost finished