Final commit (WIP) until i get back