Added Some Features, started to Code some Things

Signed-off-by: Dsigmund <sigmund.dominik@googlemail.com>