Screen gen underway

Accidentally comitted without saving a few files I didn't realize were
left open.