Revert 011f8d1..33a5577

This rolls back to commit 011f8d122f2c0517e414b3c54ae6325ef9f9fa2d.
Basic functionality