Addresses previous review observations

Now it needs some UX work.