Started to fix this shit