Merged Everything so far