Added more stuff to work on