Still need to clean up version check, but it should be working now.