working on underscore and moved some code around