committing complete re-work of this project