Initial commit of development with several TODOs.