Additions to the Master Package

Please ignore the previous commits that were made to the split packages.