extras inserting in correct place
extras function complete
fixed merge conflicts for extras functionality
code clean up from merge