added a few functions, still very little functionality