Move time import as well and upgrade stack to 16bit