Update TODOs
Move blueprint into models