Looks like you might have gotten this figured out from what I can tell from your demo. Let me know if you're still having problems.