Version 0.0.4 - Molly's Additions: Unstested