close to adding stay functionality