Micah

merging updates with master for realsies this time