Further updated to development branch, nearly zero errors
Namespacing needs more work