Update of changes so far, in order for Nick to branch