Added base functionality. Fixed A LOT!