Adding in some more basic functionality