Updates

Added initial components
Added event handlers