Attempt to do this right

commiting this