TODO notes
Fix travis build