Tauka commit

Just adding in all the things I wanted to work on. Nothing of importance
whatsoever.