Dev 1.0

I already refactored the code according to the latest comments, also untracked the xcuserdata na dn po :bow: