Commit 4 - Final Base Files