Complex sample file is now actually complex
WIP, broken - Porting more code to the object