started changing core
functionality fully tested, cosmetic changes and content left