Added less. Still needs some polishing up