Final commit A?

Not beautiful or smart but it works :)