Revert "Revert "Finished Main Development!""

This reverts commit b10b5bb6e85409b9333da06bc104e9afe519e0fa.