Master Thesis Extended