Fix all bugs, now it's working