Cleaned up/shortened method names, still thread-safe issues, will fix later