Continuing to golf this code. Stopped for now