[#56548892] Complete initial functionality, refactor, add method comments