Added some interesting stuff to both projects