Add misc files
cleaned up and added todo's