things are working but they are also noisy
fixed merge conflict with new stuff