Major rewrite, added aurora