major progress = bad commit. sorrynotsorry its late w/e