added TODO for working with sessions