17th commit

Now testing to make sure it works