did some stuff
final version?