Elance Test

Working files on this commit.