Improved and expanded functional operations. Still unstable. Module organization still pending