mattdrayer/master: Initial solution framework