Merge of @jlarkcentral's repo into the main repo