Program now compiles. Also, clean up demo files. Charts will be merged soon.