Re-organizing branches - moving current progress into master