all sorts of changes and i should have committed a long time ago but apparently I am a poopy head