Things basically working... sort of...