oh wow, still fixing bugs