Update my fork with changes

I got everything to compile and main2.o runs
kind of hack though. check it out