Some Chunk Of Implementation

Signed-off-by: Matthias Berndt <mb.systemtrap@gmail.com>
Reintegrate Some Work

Signed-off-by: Matthias Berndt <mb.systemtrap@gmail.com>