clean up of code. not sure why it isn't working
working
Merge branch 'sunday' into working