Basically started re-writing the UI with codes thats (hopefully) a lot less confusing.... sorta. at leas its done with fewer lines of code(?). Ooo, and more tests.