Working on commands
Hopefully fixed command bug