Revert "Revert "Working Build""

This reverts commit cb3e76d76355f130876b1f8987fcf7f4f7342766.