More updates, getting closer to full functionality