CommandAPI Update

Still a work in progress.