Move data up
Add window and input