fixed command
added test & marked incomplete for now