Add logic to remaining handlers
Fix command bindings