Back up and running merge and refactored huzzah