WIP got things sort of working...