Attempts to get the two broken methods working.