Doc update
Move input handling to separate structure