Solved #14; working on refactoring