cleaned up stuff except store pretty much