ok let's do this in a different branch already