Refactores and working...needs a fine combing by the other dudes.