Added yet more planned features