Even more refactorint; Introducing Sink