WIP - the dev continued ....