A Comprehensive Treatment of q-Calculus