v1.3.0 - COMPLETE REWRITE