Add some commands and organize some stuff