Keep basically both and work on them intermittently