Finished basic functionality ToDo:13.06.2014