Refactoring some stuff to get ready for snow, sand and floods! woot!