Commented most files and added methods to implement later