[WIP COMMIT] Add classes whose dependencies I couldn't satisfy