nearly working, commit before code delete of not needed bits to simplify