Initial working version
Updated to latest modules