Added in several TODOs for future developing.