added model
reorganized backbone override
added more tests