refactoring
work in progress
rm bug
fix
fix