Unfinished :(

Hey guys this isnt finished yet but i wanted to do the pull request. Will work on it more throughout the day.