Mostly working now. Don't remmeber what's changed since I last committed. Buggy commit. Committed to prevent update code from reverting anything.