Major rewrite, using Andamio as namespace