Commented stuff for discussion board. Should decide on the UI first, then implementation will follow.