Final Commit

COmpleted MVP