started fixing this shit