Attempted to fix ApiCommand, add CommandBL, some other stuff