I submitted an incomplete solution before midnight yesterday to be safe, this is a complete solution, today