Analysis

Move active development back to master for a while.