Started abstracting away the remaining Console input stuff