Brian-Branch Merge

A lot of changes