Working verison

This verison works as of 31/10/2013