Pushing to fix any issues, style changes and features to get this up online