Update

Added other features and bootstrap