Finished
Merged SJs stuff