Merge bleeding for new features

Adds new stuff