added TODO
optimization
Merge branch 'quotebuilder' of https://github.com/theimip/genius into quotebuilder
a lot of changes
Merge branch 'quotebuilder' of https://github.com/theimip/genius into quotebuilder