add some todos for future performance improvements that I can not do right now
Merge branch 'testing' of github.com:sharewave/frontus into testing