worked a little bit
merged