Re-did the architecture. Simplified it more. Components can be added on as needed.