Rewrote managers - WIP