Begin realigning factories
Use page objects in technology spec