RESTRUCTURE EVERYTHING..