Final commit. Everything works.