adding auth gaurds
dates actually work
manual merge
stuff
manual merge
things work