broken stuff
Merged master fixed conflicts