initial commit of custom code
fixed conflicts