#684 is ready for styling. closed #689