beginning to merge
fixing some merge shit
merging