cleanup
merging
starting to look a bit better like fireworks