Initial branch commit

This is just using a cleaner Python base and combining into one file. Hopefully with time this will allow for additional features/checks to be added easily.