Basic Merge

Merged Might Be Bugs