Redid some IoC work, it was stupid before.