Updated Code

Added a few more place holders
removed unused source
Another commit. A few minor updates