TODO: Clean & commit solutions for the last 2