Need more optimization, also... shiny water?