create/update methods refactored + gesplitst
Merge branch 'Girmiam' of github.com:Gi11i4m/ChronoMaticProject into Girmiam