Did some more work on a basic combo system