merging frontend updates with backend changes. it's about time