some stuff working now