Bringing current dev code from SibCo in order to start applying Brazillian changes to their updated code.