Frontend Update
Pre-merge
Backend Update

Basic turn actions
Merged
Actually merged
Cleaned