added 01/14/2014 build - non working but almost there