Updates and TODOs

Jan 17, 2011 at 3:02 PM

TBA