Final addition of features and cleaned up my blank definitions to shut hound up