work in progress, adding new commands and settings