Maybe the final commit to testing... updated a few things!