merged

merged my stuff in hopefully without breaking it