major restructuring
more updates