Working on a rebuild!

Working on a rebuild!