move modal day code into its permanent locations; build finally working \o/