Adding frontend code to the mix.

This is all of Aaren's changes, will merge the two in a little bit.