Revamp not working yet, laid out switch statements