sort of working
various tweaks to get things working nicely