LOTS of changes during HERO DAY before pilot
cleaned up old code
cleaned up old code