new stuff almost finished