Just got in from work, so my brain is fuck mush right now...  Will make a CS later.