Adding source files for my buddy project.
Resolved conflicts