Updated to a better codebase (need to fix some issues with static class, but rest work's fine).