Refactoring... STILL refuses to work :(