WIP Begun merging shanes screens