Added to User Stories for Future Iterations