Fleshed out back end a bit
Fleshed out front-end