Here's an update, I think i'll work a little more on it