Fixed memory storage. Still have to see about running and clearing after run.