Added very basic input handling