Closing #3 and fixing some defer related problems with repeat