Clean up and working on griffin speed