Fixed major issues from previous commit, finishes requirements for tagging.