Added stuff. Still not functional but releasing to get on windows.



Signed-off-by: parhamfh <parhamfh@kth.se>