Revert "Revert "Added a bunch of stuff""

This reverts commit b695ad4875ca83611b6b000677b5486f0fb04238.