Commit #17

Some design tweaks.