Clean code
Finish seprate test and development server
Clean code