Readded things that was not pushed before

Signed-off-by: Christoffer Johnsson <stoffe1992@hotmail.com>