closer to working (terrible comment I know... but committing against my will)