Pretty-much final tweaks to interface, for proof of concept