Merging my work with the new project.
Final commit for merging my project with Austin's