Adding more files (now works with new MVC pattern)