Adds a ton of functionality that Danny was asking for