overhaul for 1.6.4 started

Not even sure what I did to make it boot, but it turns on in 1.6...