updates
Merge
added lite arrow, implement modular structure