bugs
almost done