WIP Changes

Signed-off-by: Grafe <flingelfrank@hotmail.com>