Modified API, specifically inhertiance. Fixed modular testing. View spec commented.