Start refactoring to something actually working.