Everything working. Just a few things to clean and tweak.