Implemented business rules
Merge branch 'timeline' into develop