Code cleanup
Add s shape function
Add bureaucracy system