After finishing Input Handler

Signed-off-by: Beansy <nick361@gmail.com>