Initial commit. Code works but needs polishing.
First Commit: mostly works, needs polishing.
fix merge conflict (so soon?)