Fix ALL the bugs, make it work