Store variables integrated

Yet to test if working...
lunch