Move input functions and add an address
Merge pull request #382 from adrian17/input_minor

Move input functions and add an address