Basic behaviour working. Added another couple of defaults.