Refactored; Added InputCollectingSystem