Added a BUNCH of stuff