Protein front end
Fixed merge problems, added protein front end