Still a lot more todo

There is a lot to still implement but I thought I would start here for now. -TRex22

Merging to have some code-base