Most bugs fixed, most functionality implemented