Version 3.0 second initial commit

Last commit of version 3 was screwed up so this is the current version