Major updates. Still buggy though