The Dynamics Of Layered And Non-Layered Oscillatory Double-Diffusive Convection