Major: More combat revamping. Working pretty smoth now though.