this is an incomplete commit but i need it to work on code upstairs