Needs more work at the core
Fixed input bug