WIP: Finish unfinished methods