f
Resolved conflicts
ACO optimized. Didn't do very much in other classes. Oh, I did remove parts of the roc package because they were worthless.

Signed-off-by: cauth0n <derek.reimanis@gmail.com>