V1.0 - See comments within the commit