Commit 48

Merge working, reset fixed