Beta Up #6

Lot of code (managers + better functions)