Meeting with Peter

Code as is after meeting with Peter Wittich