Simplify to necessary functions.
Add readme file.
Fix merge conflicts.