Cleaned up fluff and got it generally working