Added Q and started working on smooths