This will be moved before merge.  Just need to get feedback on how it's working.