Cleaned up, should be ready soon
New module system first steps