still fixing some merge issues
commits changes ebfore merge
more merge stuff