Now tested with numeric input
Initial commit after refactor