More OC work. I know how to use it properly now. Also some defactoring.