things are coming along
general outline completed
fixed merge conflict