3 files changed, 32 insertions, 5 deletions

diff --git a/src/ConsoleInterface/Menu.cpp b/src/ConsoleInterface/Menu.cpp
index 669fb6c..f12dbf2 100644
--- a/src/ConsoleInterface/Menu.cpp
+++ b/src/ConsoleInterface/Menu.cpp
@@ -7,7 +7,7 @@ Menu::Menu(const Command* commands, unsigned commandCount) {
 
 void Menu::navigate() const {
 	if (menuOptions.get_count() == 0) {
-		std::cout << "Menu is empty!" << std::endl;
+		printLine("Menu is empty!");
 		return;
 	}
 
@@ -17,7 +17,9 @@ void Menu::navigate() const {
 
 	unsigned buffer = 0;
 	while (0 == buffer || buffer >= menuOptions.get_count()) {
-		std::cout << "Execute No [1-" << menuOptions.get_count() << "]: ";
+		print("Execute No [1-");
+		print(menuOptions.get_count());
+		print("]: ");
 		std::cin >> buffer;
 	}
 
diff --git a/src/ConsoleInterface/Toolbox.cpp b/src/ConsoleInterface/Toolbox.cpp
index cdfecb3..6e67dcb 100644
--- a/src/ConsoleInterface/Toolbox.cpp
+++ b/src/ConsoleInterface/Toolbox.cpp
@@ -1,5 +1,25 @@
 #include "Toolbox.h"
 
+template <class T>
+void print(const T* item) {
+	std::cout << item;
+}
+
+template <class T>
+void printLine(const T* item) {
+	std::cout << item << std::endl;
+}
+
+template <class T>
+void print(const T& item) {
+	std::cout << item;
+}
+
+template <class T>
+void printLine(const T& item) {
+	std::cout << item << std::endl;
+}
+
 int orderedListIndex = 1;
 
 void printOrderedListElem(const char* message) {
diff --git a/src/ConsoleInterface/Toolbox.h b/src/ConsoleInterface/Toolbox.h
index 49f0fa7..3ddd283 100644
--- a/src/ConsoleInterface/Toolbox.h
+++ b/src/ConsoleInterface/Toolbox.h
@@ -1,10 +1,15 @@
 #ifndef HEADER_CONSOLEINTERFACE_TOOLBOX
 #define HEADER_CONSOLEINTERFACE_TOOLBOX
 
-#include <iostream>
 
-void print(const char* message);
-void printLine(const char* message);
+template <class T>
+void print(const T* item);
+template <class T>
+void printLine(const T* item);
+template <class T>
+void print(const T& item);
+template <class T>
+void printLine(const T& item);
 
 void printOrderedListElem(const char* message);
 void resetOrderedList(int starter = 1);