Revert "Front-End Work"

Shouldn't have merged this