rewrite all to work with the new buddyforms beta.

round one from tow ;)