Almost done! Committing now out of fear of losing this progress!