temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds