add some security
wrap-ify everything, yikes