removed old, commented code
WIP for Max