Development

had merge issues but this is the most up-to-date development.