Working on 400/500 and some cleanup.