Work thus far

All the files included here