Did some mechanics and I'll add more soon