Cleaned up demos and added beginning of todo sample