1.0.1 - Complete Logic