Still broken but a bit better!

FIXIT!