Cleaned up project + Seperate class for visualizing