integrate some aether code from a previous project