updated - WIP!

I'm working on tabs instead of putting everything below another