Added saving of positions and supporting commands