still trying to work on correct new; need event aggregating i think