Still buggy. Some functionality fixed.