first refractor

changed everything