Things are getting messy
Looking a little neater, not functional yet though