Working everything just fixing bugs