More things to implement / ideas to think about