pulling tonys debug
all
debug pull
merging pull changes
changes
modals and clockout fix