Refactored the old creepy code to some possibly better