Version 3.5.0

Working version, but still needs code cleaning.