refactoring, added addClip()
Added "Add Clip" functionality

and streamlined a mathy bit