Integrated and combined to a point where this is closed and bugs should be created, closes #82