Frontend

Pulling in aboutaaron's changes for frontend