Recent Updates

@mtdowling Just want a quick code review before merging. Thanks!