Working on 13

Very close to finishing, just need to pass the last test