Fifteenth Commit

Stuff that failed to upload in the last commit