Merged my functions into the current structure, reorganized files together. Set to C++ base. The things that have much more overhead in C++ we aren't using. I commented out one function that doesnt' currently give correct argument count. (I'm tired, didn't check how it works)