Fixing complie errors, PS, this branch will probably will have errors for a while, while it is in initial development, I hope that is not a problem