More unfinished code \nMore unfinished code which I'm checking in for portability.