Revert "blah"

This reverts commit c0a707884bac6d328f73df8e3344c7b121c0b508.
Revert "New standards to keep things simple"

This reverts commit 6979ee16c7c9354449619502554db6a4ae34f915.