weee now we're getting somewhere
just needs fine tuning