seems to have not broken anything, now to write some tests