Consolidating & Re-working whole model
Reworked with 'better' flow
Merge remote-tracking branch 'origin/master'