Finish converting it all to reflection. Removed cb dependency ;D