it's functioning, woo
functioning correctly now, merged