a lot of cleanup and todos to ship this page