Additional Features

I've added some more of the features. There has been a strange issue I have run into regarding tests, which is why a lot are missing atm. I am still working to resolve the issue. :)