Solutions support

@mlu-appear yeah, https://www.pivotaltracker.com/story/show/80528184 (WIP)