Add pop/push command

Targets #330.

Please review and comment.
Fixed.