New stuff

Has a couple problems on line 13