Ah 12

@ahopkins1 I merged develop into your branch then fixed a minor bug. Hopefully all the tests should pass. If so please merge 😄