Removed empty block and used etal
Finished first draft of input devices