Revert "Published (took out some features not fully implemented)"

This reverts commit f6f7c4fe114a67311e23e73a3d5779994daee762.