Made some updates. Slightly buggy. TODO: Fix DLLImport Error