Solutions support

@mlu-appear :+1: good catch