Working on front end.

Fixes #2
Fixes #3