Refactored baby repo/fixes