Ported everything over to 1.6 I believe. Kenneth will tell me if there is anything missing.