This should be cleaned up!