Fixing bugs, still buggy, working on it