Added few things, not even compiling but yeah, progress