Implemented business rules
Merge branch 'timeline' into develop
Merge branch 'develop'