Add a bucnh of yet-unwworking code