Everything is working. Pretty much Final.

Still need to clean stuff up