formatting and merging incompatabilities
Merged and shit