Uploaded broken code. Pending complete module rewrite