fixed almost all of client side and started store stuff