changed everything and it should be ok but fucking circular dependencies
IT FUCKING BUILDS
Many bugs fixed many still remain
fewest errors yet
Merge remote-tracking branch 'origin/master'