Final comit before merging old and new GUI code.