SmartController - First Commit