Neon

This will probably need some more tweaking before merging, but got anxious :-)