Wrote in scales
Made output more modular
Added a TODO