okay, it's a little awkward, but should be working now...