Code Review 4/5/2013 Part 1 - Non-Domain