added todos from fremdentwurf