Update 24/11/14
Major Refactoring & Model Update 07/12/14