work on styling has begun with foundation
merging conflicts still
more continued work on patching things
work done to patch a lot of things