some work on some stuff