Refactored code, still not quite done