Added some basic stuff to get something going