Initial check in, multi needs to be done still, as well as fixing some
dateline bugs