Changed focus some, many changes to reflect that