Move some stuff around and add Lincoln