fixed merge fuck up and restructured