Final commit for a while. Working really well.