Merge branch 'develop' into feature/Forms
Making functions return something
Merge branch 'feature/Forms' into develop