Dev

Self-command rewrites