Builds out some more basic functionality