Works now

Not sure about everything though. :p

Signed-off-by: Gerco van Heerdt <gercovanheerdt@gmail.com>