Almost everythings working.

Just have the occasional crash to fix, along with changing the Settings page, and we're ready to merge into dev.