Code working, need to debug and clean up plots