Refactored Code
Have to rewrite structure progress and all related