Andy Huska

Up vote for merging this branch to master, or at least have a conversation about how to finish this branch off so it is ready. I'm willing to help!