@eaescob I'm still worrying about this code... can be safely dropped?
@koeppea thoughts?