Added a lot of KeyListerns and Logic