Finished a few stub methods