Some simple handler updates. This is still just testing overall design
and proof of concept. Not usable yet.