first commit
constructor methods
rmccue not currently needed
fixed conflicts in gitignore