Working version, works local and online. Sent to Rachy for testing.