On-going Master Thesis