Implemented Lukas' TODOs from last Teammeeting