TRULY FINAL EPIC COMMIT (forgot UML, dangit!)