Reduced files to what works, let's make this a proper rewrite!