TODO at top has leftover things. Added keyboard. Few TODOs in code