Closes #18 and changed some stuff to get it working with new model
Merge branch 'enhancement-#18' into develop