bumbleshark-whew, finally finished this