ammar added some comments on planned changes. Might have to clean them up after we apply new features