Forgot to get rid of some hardcoding , Removed some debug code