Code Refactor; Phase II not working, NEED TO FIX!