made some stuff static... still having a nasty bug