Final commit before thesis deadly, unfortunetely