Slowly adding on more features

sweet stuff