Macros and main data structure
Cleanup and logging
Added more debug entries....lotz more
Merge branch 'development'