Finished all but bugs