These aren't super important and having slows the app down a lot, they can go for now. Related to #7