diff --git a/apps/graph/function_store.cpp b/apps/graph/function_store.cpp
index 5f33d0122..67f05b7b0 100644
--- a/apps/graph/function_store.cpp
+++ b/apps/graph/function_store.cpp
@@ -3,10 +3,8 @@ extern "C" {
 #include <assert.h>
 }
 
-constexpr int numberOfDefaultColors = 3;
-constexpr KDColor defaultColors[numberOfDefaultColors] = {
-  KDColorRed, KDColorGreen, KDColorBlue
-};
+constexpr int Graph::FunctionStore::numberOfDefaultColors;
+constexpr KDColor Graph::FunctionStore::defaultColors[numberOfDefaultColors];
 
 Graph::FunctionStore::FunctionStore() :
   m_numberOfFunctions(0)
@@ -18,10 +16,21 @@ Graph::Function * Graph::FunctionStore::functionAtIndex(int i) {
   return &m_functions[i];
 }
 
-void Graph::FunctionStore::pushFunction(const char * functionText) {
+void Graph::FunctionStore::addFunction(Function * f) {
   assert(m_numberOfFunctions < k_maxNumberOfFunctions);
-  m_functions[m_numberOfFunctions] = Function(functionText, defaultColors[m_numberOfFunctions%numberOfDefaultColors]);
-  m_numberOfFunctions++;
+  m_functions[m_numberOfFunctions++] = (*f);
+}
+
+void Graph::FunctionStore::removeFunction(Function * f) {
+  int i = 0;
+  while (&m_functions[i] != f && i < m_numberOfFunctions) {
+    i++;
+  }
+  assert(i>=0 && i<m_numberOfFunctions);
+  m_numberOfFunctions--;
+  for (int j = i; j<m_numberOfFunctions; j++) {
+    m_functions[j] = m_functions[j+1];
+  }
 }
 
 int Graph::FunctionStore::numberOfFunctions() {
diff --git a/apps/graph/function_store.h b/apps/graph/function_store.h
index 8f482d287..9a1e75f38 100644
--- a/apps/graph/function_store.h
+++ b/apps/graph/function_store.h
@@ -9,8 +9,16 @@ class FunctionStore {
 public:
   FunctionStore();
   Function * functionAtIndex(int i);
+  void addFunction(Function * f);
+  void removeFunction(Function * f);
   void pushFunction(const char * functionText);
+
   int numberOfFunctions();
+
+  constexpr static int numberOfDefaultColors = 3;
+  constexpr static KDColor defaultColors[numberOfDefaultColors] = {
+    KDColorRed, KDColorGreen, KDColorBlue
+  };
 private:
   int m_numberOfFunctions;
   static constexpr int k_maxNumberOfFunctions = 8;
diff --git a/apps/graph/graph_app.cpp b/apps/graph/graph_app.cpp
index b9292e72e..c6435dd76 100644
--- a/apps/graph/graph_app.cpp
+++ b/apps/graph/graph_app.cpp
@@ -8,10 +8,18 @@ GraphApp::GraphApp() :
   m_graphController(GraphController(nullptr, &m_functionStore)),
   m_tabViewController(this, &m_listStackViewController, &m_graphController)
 {
-  m_functionStore.pushFunction("(x-1)*(x+1)*x");
-  m_functionStore.pushFunction("x*x");
-  m_functionStore.pushFunction("3");
-  m_functionStore.pushFunction("x*x*x");
+  Graph::Function function = Graph::Function("(x-1)*(x+1)*x",
+      Graph::FunctionStore::defaultColors[(m_functionStore.numberOfFunctions())%Graph::FunctionStore::numberOfDefaultColors]);
+  m_functionStore.addFunction(&function);
+  function = Graph::Function("x*x",
+      Graph::FunctionStore::defaultColors[(m_functionStore.numberOfFunctions())%Graph::FunctionStore::numberOfDefaultColors]);
+  m_functionStore.addFunction(&function);
+  function = Graph::Function("3",
+      Graph::FunctionStore::defaultColors[(m_functionStore.numberOfFunctions())%Graph::FunctionStore::numberOfDefaultColors]);
+  m_functionStore.addFunction(&function);
+  function = Graph::Function("x*x*x",
+      Graph::FunctionStore::defaultColors[(m_functionStore.numberOfFunctions())%Graph::FunctionStore::numberOfDefaultColors]);
+  m_functionStore.addFunction(&function);
 }
 
 ViewController * GraphApp::rootViewController() {