Style more or less done... except for the code, think I need to tweak that formatting, a lot