Almost caught up to 1.4.6! Still need to fix key counting.