Added basic command + some small changes and additions