Basic functionallity returned with code refactor