Add defines to models; Small rewrite in style;
Add new work complete;