- Added lots of functions and structures