Made some more progress, might be able to finish it tomorrow. I am tired now.