WIP - Added initial fixtures and updated model/view representation