Initial work 2013
Second round of edits