More work on input, different functions, pretty output