Added some work I done a while back