RMI Middleware
Test
Big merge
Quick fixes