Short Methods 9/8/2014

Also the lambdas are still here :'( Definitely refactor this one.