added commands again (work in progress)