BBy mostly done, still have bugs