Development code - June 24

Pre-Shad Commit