refactoring
testing
working fast, bad view