Beta 0.7 Updates

Updated to include Beta 0.7 updates.