Revert "unfactor fix?"

This reverts commit 5a849d997f5b2584bb60919cf3349ff225d3482b.
Revert "break out functions"

This reverts commit e804058a9f8941e02ec70962b0466662db70ab97.
testing window.currentdate