Major progress in the new system, still not sure if it works completely