Mostly working for 1.6.2 added more oredictionary functionality