Lots of changes and additions. Should've committed earlier but I didn't. Now broken Project page a little. Working to correct these issues now