Stub out Thursday and Friday
Fix merge conflict