Includes more features but needs csv logging

csv to be included by 2/20/13