Cleanup headers, better docs
Remove bad first try