Still trying to hack out a  solution